Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add a nil check before trying to adding mc annotation #966

Merged
merged 1 commit into from
Feb 17, 2025
Merged

Add a nil check before trying to adding mc annotation #966

merged 1 commit into from
Feb 17, 2025

Conversation

aaronfern
Copy link
Contributor

@aaronfern aaronfern commented Feb 17, 2025 •
edited
Loading

What this PR does / why we need it:
This PR fixes a bug where a nil check was not performed before adding an annotation to a machine.
Machines are not always guaranteed to have annotations, hence a nil check is required here

Which issue(s) this PR fixes:
Fixes #

Special notes for your reviewer:

Release note:

A bug was fixed where MCM panics when trying to add an annotation to a nil map

@aaronfern aaronfern requested a review from a team as a code owner February 17, 2025 14:15
@gardener-robot gardener-robot added needs/review Needs review size/xs Size of pull request is tiny (see gardener-robot robot/bots/size.py) labels Feb 17, 2025
@gardener-robot-ci-1 gardener-robot-ci-1 added the reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) label Feb 17, 2025
@gardener-robot-ci-3 gardener-robot-ci-3 added needs/ok-to-test Needs approval for testing (check PR in detail before setting this label because PR is run on CI/CD) and removed reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) labels Feb 17, 2025
elankath
elankath approved these changes Feb 17, 2025
View reviewed changes
Copy link
Contributor

@elankath elankath left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks.

@aaronfern aaronfern merged commit 195b829 into gardener:master Feb 17, 2025
8 checks passed
@gardener-robot gardener-robot added the status/closed Issue is closed (either delivered or triaged) label Feb 17, 2025
aaronfern added a commit to aaronfern/machine-controller-manager that referenced this pull request Feb 17, 2025
@aaronfern
Add a nil check before trying to adding mc annotation (gardener#966)
8c3abdb
@aaronfern aaronfern mentioned this pull request Feb 17, 2025
Merged
aaronfern added a commit that referenced this pull request Feb 17, 2025
@aaronfern
Add a nil check before trying to adding mc annotation (#966) (#967)
a525cbb
takoverflow pushed a commit to takoverflow/machine-controller-manager that referenced this pull request Feb 27, 2025
@aaronfern @takoverflow
Add a nil check before trying to adding mc annotation (gardener#966)
cf0d11f
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@elankath elankath elankath approved these changes

Assignees
No one assigned
Labels
needs/ok-to-test Needs approval for testing (check PR in detail before setting this label because PR is run on CI/CD) needs/review Needs review size/xs Size of pull request is tiny (see gardener-robot robot/bots/size.py) status/closed Issue is closed (either delivered or triaged)
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@aaronfern @elankath @gardener-robot-ci-1 @gardener-robot-ci-3 @gardener-robot